Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Apr 2010 13:11:29 +0000 (13:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Apr 2010 13:11:29 +0000 (13:11 +0000)
commitb9103a307cea6c87fb410a15972b458af8a7bbea
tree2ebf7a02237416e42dc9a3a05c84a4320b926770
parent3554f3d0043b64ae5774dc494ca00b9c4c2b68b2
parentf7811fda5fd05566a2cfb16386d1ea3c80185b6d
Merge from mainline.